merge with xen-unstable.hg
authorAlex Williamson <alex.williamson@hp.com>
Mon, 4 Feb 2008 15:17:58 +0000 (08:17 -0700)
committerAlex Williamson <alex.williamson@hp.com>
Mon, 4 Feb 2008 15:17:58 +0000 (08:17 -0700)

Trivial merge